theme: Apply spacing to .overview-icon-with-label correctly

- Remove margin-bottom for StIcon, which is not only ineffective, but
  also created a bug in app folders.
- Remove ">" which is invalid for overview icons that are not app
  folders.
- Apply spacing to the correct target "StBoxLayout", not the parent
  .overview-icon.overview-icon-with-label.

Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/2129

diff --git a/data/theme/gnome-shell-sass/widgets/_app-grid.scss b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
index cc2b7a7e72645dc5be9aedddd7152d89612f1d23..ba6eb608dc9fcc131414811b9198f7712bb892b9 100644 (file)
--- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
@@ -11,7 +11,6 @@ $app_icon_padding: 24px;
 
   .overview-icon {
     icon-size: $app_icon_size;
-    StIcon { margin-bottom: $base_margin; } // margin on icon so label isn't close
   }
 }
 
@@ -36,9 +35,12 @@ $app_grid_fg_color: #fff;
 %app-well-app {
   @include overview-icon($app_grid_fg_color);
 
-  > .overview-icon.overview-icon-with-label {
+  .overview-icon.overview-icon-with-label {
     padding: 10px 8px 5px 8px;
-    spacing: $base_spacing;
+
+    > StBoxLayout {
+      spacing: $base_spacing;
+    }
   }
 }